From 8fca126410e401394f920346366f440943d365fb Mon Sep 17 00:00:00 2001 From: webchick Date: Wed, 21 Sep 2016 10:39:34 -0700 Subject: [PATCH] =?UTF-8?q?Issue=20#2782803=20by=20tkoleary,=20tedbow,=20x?= =?UTF-8?q?jm,=20cilefen,=20yoroy,=20davidhernandez,=20prestonso,=20David?= =?UTF-8?q?=5FRothstein,=20G=C3=A1bor=20Hojtsy,=20nod=5F,=20Dries:=20Renam?= =?UTF-8?q?e=20Outside-in=20module=20to=20"Settings=20Tray"=20in=20the=20U?= =?UTF-8?q?I=20and=20in=20comments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1ffb177e41e28921707a7bce0e2512da9f6a4957) --- core/modules/outside_in/css/outside_in.details.css | 2 +- core/modules/outside_in/css/outside_in.form.css | 2 +- core/modules/outside_in/css/outside_in.module.css | 4 ++-- core/modules/outside_in/css/outside_in.motion.css | 2 +- core/modules/outside_in/css/outside_in.table.css | 2 +- core/modules/outside_in/css/outside_in.tabledrag.css | 2 +- core/modules/outside_in/css/outside_in.theme.css | 6 +++--- core/modules/outside_in/css/outside_in.toolbar.css | 2 +- core/modules/outside_in/js/outside_in.js | 4 ++-- core/modules/outside_in/outside_in.info.yml | 2 +- core/modules/outside_in/outside_in.install | 2 +- core/modules/outside_in/outside_in.module | 4 ++-- .../outside_in/src/Cache/Context/OutsideInCacheContext.php | 2 +- core/modules/outside_in/src/OutsideInManager.php | 2 +- core/modules/outside_in/src/OutsideInManagerInterface.php | 4 ++-- .../outside_in/src/Tests/Ajax/OffCanvasDialogTest.php | 2 +- .../FunctionalJavascript/OutsideInJavascriptTestBase.php | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/modules/outside_in/css/outside_in.details.css b/core/modules/outside_in/css/outside_in.details.css index 94c1aadffd5..5b981f0a13c 100644 --- a/core/modules/outside_in/css/outside_in.details.css +++ b/core/modules/outside_in/css/outside_in.details.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for summary and details in the Outside-In module off canvas tray. + * Visual styling for summary and details in the Settings Tray module's off canvas tray. */ .ui-dialog-offcanvas details, diff --git a/core/modules/outside_in/css/outside_in.form.css b/core/modules/outside_in/css/outside_in.form.css index 640f2642b53..90dc2803212 100644 --- a/core/modules/outside_in/css/outside_in.form.css +++ b/core/modules/outside_in/css/outside_in.form.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for forms in the Outside-In module off canvas tray. + * Visual styling for forms in the Settings Tray module's off canvas tray. */ .ui-dialog-offcanvas label { diff --git a/core/modules/outside_in/css/outside_in.module.css b/core/modules/outside_in/css/outside_in.module.css index 03deeb64024..9e360372dd6 100644 --- a/core/modules/outside_in/css/outside_in.module.css +++ b/core/modules/outside_in/css/outside_in.module.css @@ -1,6 +1,6 @@ /** * @file - * Styling for Outside-In module. + * Styling for Settings Tray module. */ /* Position the offcanvas tray container outside the right of the viewport. */ @@ -29,7 +29,7 @@ /* * Position the edit toolbar tab. - * @todo Move changes into contextual module when outside-in is not + * @todo Move changes into contextual module when Settings Tray is not * experimental: https://www.drupal.org/node/2784591. */ .toolbar .toolbar-bar .contextual-toolbar-tab.toolbar-tab { diff --git a/core/modules/outside_in/css/outside_in.motion.css b/core/modules/outside_in/css/outside_in.motion.css index 096bfe0f96e..8fbf5cb34af 100644 --- a/core/modules/outside_in/css/outside_in.motion.css +++ b/core/modules/outside_in/css/outside_in.motion.css @@ -1,6 +1,6 @@ /** * @file - * Motion effects for outside-in module. + * Motion effects for Settings Tray module. * * Motion effects are in a separate file so that they can be easily turned off * to improve performance if desired. diff --git a/core/modules/outside_in/css/outside_in.table.css b/core/modules/outside_in/css/outside_in.table.css index faacc212197..2a02d30a8aa 100644 --- a/core/modules/outside_in/css/outside_in.table.css +++ b/core/modules/outside_in/css/outside_in.table.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for tables in the Outside-In module off canvas tray. + * Visual styling for tables in the Settings Tray module's off canvas tray. */ .ui-dialog-offcanvas table { diff --git a/core/modules/outside_in/css/outside_in.tabledrag.css b/core/modules/outside_in/css/outside_in.tabledrag.css index 9601992b1d6..f0259778899 100644 --- a/core/modules/outside_in/css/outside_in.tabledrag.css +++ b/core/modules/outside_in/css/outside_in.tabledrag.css @@ -1,6 +1,6 @@ /** * @file - * Table drag behavior for outside-in module. + * Table drag behavior for Settings Tray module. * * @see tabledrag.js */ diff --git a/core/modules/outside_in/css/outside_in.theme.css b/core/modules/outside_in/css/outside_in.theme.css index 4da0765d866..438fbb25eb3 100644 --- a/core/modules/outside_in/css/outside_in.theme.css +++ b/core/modules/outside_in/css/outside_in.theme.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for Outside-In module. + * Visual styling for Settings Tray module. */ /* @todo Move this into toolbar when this module is no longer experimental: @@ -198,7 +198,7 @@ /* Groups below here with todos to move to new component need to load last. */ /** - * Visual styling for buttons in the Outside-In module off canvas tray. + * Visual styling for buttons in the Settings Tray module's off canvas tray. * @todo Move to it's own component: * https://www.drupal.org/node/1945262. */ @@ -238,7 +238,7 @@ /* - * Visual styling for dropbutton in the Outside-In modules off canvas tray. + * Visual styling for dropbutton in the Settings Tray module's off canvas tray. * @todo Move to it's own component: * https://www.drupal.org/node/1945262. */ diff --git a/core/modules/outside_in/css/outside_in.toolbar.css b/core/modules/outside_in/css/outside_in.toolbar.css index b8b6397512c..3f7e0447a70 100644 --- a/core/modules/outside_in/css/outside_in.toolbar.css +++ b/core/modules/outside_in/css/outside_in.toolbar.css @@ -1,6 +1,6 @@ /** * @file - * Visual styling for the toolbar when Outside-In module is enabled. + * Visual styling for the toolbar when Settings Tray module is enabled. */ /* @todo Move this into toolbar when module is not experimental: diff --git a/core/modules/outside_in/js/outside_in.js b/core/modules/outside_in/js/outside_in.js index 84e04a86f00..b7bd32da0c4 100644 --- a/core/modules/outside_in/js/outside_in.js +++ b/core/modules/outside_in/js/outside_in.js @@ -1,6 +1,6 @@ /** * @file - * Drupal's Outside-In library. + * Drupal's Settings Tray library. */ (function ($, Drupal) { @@ -52,7 +52,7 @@ // Bind a listener to all 'Quick edit' links for blocks // Click "Edit" button in toolbar to force Contextual Edit which starts - // Outside-In edit mode also. + // Settings Tray edit mode also. data.$el.find('.outside-inblock-configure a').on('click', function () { if (!isActiveMode()) { $('div.contextual-toolbar-tab.toolbar-tab button').click(); diff --git a/core/modules/outside_in/outside_in.info.yml b/core/modules/outside_in/outside_in.info.yml index 2ff1c7a3d82..f25420f3ebf 100644 --- a/core/modules/outside_in/outside_in.info.yml +++ b/core/modules/outside_in/outside_in.info.yml @@ -1,4 +1,4 @@ -name: 'Outside-In' +name: 'Settings Tray' type: module description: 'Provides the ability to change the most common configuration from the Drupal front-end.' package: Core (Experimental) diff --git a/core/modules/outside_in/outside_in.install b/core/modules/outside_in/outside_in.install index d0429157df8..e205e46eb4b 100644 --- a/core/modules/outside_in/outside_in.install +++ b/core/modules/outside_in/outside_in.install @@ -2,7 +2,7 @@ /** * @file - * Install, update and uninstall functions for the Outside-In module. + * Install, update and uninstall functions for the Settings Tray module. */ use Drupal\Core\Cache\Cache; diff --git a/core/modules/outside_in/outside_in.module b/core/modules/outside_in/outside_in.module index f82d8397ffb..95e5fbeea12 100644 --- a/core/modules/outside_in/outside_in.module +++ b/core/modules/outside_in/outside_in.module @@ -18,10 +18,10 @@ function outside_in_help($route_name, RouteMatchInterface $route_match) { switch ($route_name) { case 'help.page.outside_in': $output = '

' . t('About') . '

'; - $output .= '

' . t('The outside-in module provides an \'edit mode\' in which clicking on a block opens a side tray which allows configuration to be altered without leaving the page.For more information, see the online documentation for the Outside-In module.', [':outside-in-documentation' => 'https://www.drupal.org/documentation/modules/outside_in']) . '

'; + $output .= '

' . t('The Settings Tray module provides an \'edit mode\' in which clicking on a block opens a slide-out tray which allows configuration to be altered without leaving the page.For more information, see the online documentation for the Settings Tray module.', [':outside-in-documentation' => 'https://www.drupal.org/documentation/modules/outside_in']) . '

'; $output .= '

' . t('Uses') . '

'; $output .= '
'; - $output .= '
' . t('Editing blocks on the same page in the side tray') . '
'; + $output .= '
' . t('Editing blocks on the same page in the slide-out tray') . '
'; $output .= '
'; return ['#markup' => $output]; } diff --git a/core/modules/outside_in/src/Cache/Context/OutsideInCacheContext.php b/core/modules/outside_in/src/Cache/Context/OutsideInCacheContext.php index 193b948461b..4a24671d014 100644 --- a/core/modules/outside_in/src/Cache/Context/OutsideInCacheContext.php +++ b/core/modules/outside_in/src/Cache/Context/OutsideInCacheContext.php @@ -34,7 +34,7 @@ class OutsideInCacheContext implements CacheContextInterface { * {@inheritdoc} */ public static function getLabel() { - return t('Outside-In'); + return t('Settings Tray'); } /** diff --git a/core/modules/outside_in/src/OutsideInManager.php b/core/modules/outside_in/src/OutsideInManager.php index 295655b8505..666a93837be 100644 --- a/core/modules/outside_in/src/OutsideInManager.php +++ b/core/modules/outside_in/src/OutsideInManager.php @@ -7,7 +7,7 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Session\AccountInterface; /** - * Manages information related to Outside-In. + * Manages information related to Settings Tray. */ class OutsideInManager implements OutsideInManagerInterface { diff --git a/core/modules/outside_in/src/OutsideInManagerInterface.php b/core/modules/outside_in/src/OutsideInManagerInterface.php index bb3dae53cc0..684adb3f0df 100644 --- a/core/modules/outside_in/src/OutsideInManagerInterface.php +++ b/core/modules/outside_in/src/OutsideInManagerInterface.php @@ -8,10 +8,10 @@ namespace Drupal\outside_in; interface OutsideInManagerInterface { /** - * Determines if the Outside-In logic should be run on the current page. + * Determines if the Settings Tray logic should be run on the current page. * * @return bool - * TRUE if the Outside-In logic should be run. + * TRUE if the Settings Tray logic should be run. */ public function isApplicable(); diff --git a/core/modules/outside_in/src/Tests/Ajax/OffCanvasDialogTest.php b/core/modules/outside_in/src/Tests/Ajax/OffCanvasDialogTest.php index fc3851b1c2b..1e5b0d19510 100644 --- a/core/modules/outside_in/src/Tests/Ajax/OffCanvasDialogTest.php +++ b/core/modules/outside_in/src/Tests/Ajax/OffCanvasDialogTest.php @@ -9,7 +9,7 @@ use Drupal\system\Tests\Ajax\AjaxTestBase; /** * Performs tests on opening and manipulating dialogs via AJAX commands. * - * @group Outside-In + * @group outside_in */ class OffCanvasDialogTest extends AjaxTestBase { diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php index bc9ff9ae62b..f27fb1ae566 100644 --- a/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php +++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OutsideInJavascriptTestBase.php @@ -5,7 +5,7 @@ namespace Drupal\Tests\outside_in\FunctionalJavascript; use Drupal\FunctionalJavascriptTests\JavascriptTestBase; /** - * Base class contains common test functionality for the Outside-In module. + * Base class contains common test functionality for the Settings Tray module. */ abstract class OutsideInJavascriptTestBase extends JavascriptTestBase {