diff --git a/modules/acquia_cms_tour/acquia_cms_tour.libraries.yml b/modules/acquia_cms_tour/acquia_cms_tour.libraries.yml index 68e3f153a4..214e64383f 100644 --- a/modules/acquia_cms_tour/acquia_cms_tour.libraries.yml +++ b/modules/acquia_cms_tour/acquia_cms_tour.libraries.yml @@ -1,8 +1,3 @@ -acquia_cms_tour: - css: - theme: - css/acquia_cms_tour.css: {} - acquia_cms_tour_dashboard: css: theme: diff --git a/modules/acquia_cms_tour/acquia_cms_tour.routing.yml b/modules/acquia_cms_tour/acquia_cms_tour.routing.yml index 0596691a08..8b0b4ac353 100644 --- a/modules/acquia_cms_tour/acquia_cms_tour.routing.yml +++ b/modules/acquia_cms_tour/acquia_cms_tour.routing.yml @@ -17,7 +17,7 @@ acquia_cms_tour.starter_kit_welcome_modal_form: acquia_cms_tour.welcome_modal_form: path: '/admin/tour/dashboard/welcome-modal-form' defaults: - _title: 'Modal Form' + _title: 'Welcome to Acquia CMS' _controller: '\Drupal\acquia_cms_tour\Controller\WelcomeModalController::openWelcomeModalForm' requirements: _permission: 'access acquia cms tour dashboard' @@ -25,7 +25,7 @@ acquia_cms_tour.welcome_modal_form: acquia_cms_tour.installation_wizard: path: '/acquia-cms-tour/installation-wizard' defaults: - _title: 'Acquia CMS Installation wizard' + _title: 'Acquia CMS Configuration Wizard' _form: 'Drupal\acquia_cms_tour\Form\InstallationWizardForm' requirements: _permission: 'access content' @@ -33,7 +33,7 @@ acquia_cms_tour.installation_wizard: acquia_cms_tour.selection_wizard: path: '/acquia-cms-tour/starter-kit-selection-wizard' defaults: - _title: 'Acquia CMS Installation wizard' + _title: 'Acquia CMS Starterkit Wizard' _form: 'Drupal\acquia_cms_tour\Form\StarterKitSelectionWizardForm' requirements: _permission: 'access content' diff --git a/modules/acquia_cms_tour/css/acquia_cms_installation_wizard.css b/modules/acquia_cms_tour/css/acquia_cms_installation_wizard.css index 7e22b0f196..f7df8f6e35 100644 --- a/modules/acquia_cms_tour/css/acquia_cms_installation_wizard.css +++ b/modules/acquia_cms_tour/css/acquia_cms_installation_wizard.css @@ -71,6 +71,19 @@ font-size: 14px; font-weight: normal; } +.acms-starter-kit-wizard .ui-dialog-buttonset, +.acms-installation-wizard .ui-dialog-buttonset { + width: 60%; + float: right; + display: block; + text-align: right; +} +.acms-installation-wizard .ui-dialog-buttonset button:first-child:not(.skip-button) { + float: left; +} +.acms-installation-wizard .ui-dialog-buttonset button.skip-button { + float: none; +} @media screen and (max-width: 767px) { .acms-installation-wizard .acquia-cms-tour-installation-wizard { diff --git a/modules/acquia_cms_tour/css/acquia_cms_tour.css b/modules/acquia_cms_tour/css/acquia_cms_tour.css deleted file mode 100644 index 2fb28f9e2a..0000000000 --- a/modules/acquia_cms_tour/css/acquia_cms_tour.css +++ /dev/null @@ -1,128 +0,0 @@ -.tour-page { - color: #222330; -} -.tour-page .section-hero .row { - display: flex; -} -.tour-page .section-hero { - color: white; - background-image: url('../assets/images/hero-background.png'); - background-position: center; - background-size: cover; - background-repeat: no-repeat; - background-attachment: scroll; - padding: 30px 18px 50px 50px; -} -a:-webkit-any-link { - cursor: pointer; -} -.tour-page .section-hero .button--primary { - background-color: #26a3dd; -} -.tour-page .section-hero .text-section { - width: 75%; - margin-right: 5%; -} -.tour-page .section-content { - display: flex; - margin-top: 60px; - opacity: 0.7; -} -.tour-page .section-content .sidenav { - width: 44%; - margin-right: 6%; -} -.tour-page .sidenav ul { - margin-left: 0; -} -.tour-page .sidenav p { - font-weight: 500; - font-size: 16px; -} -.tour-page .sidenav ul li { - padding-bottom: 10px; - padding-top: 10px; - border-top: 1px solid #aba8a8; -} -.tour-page .sidenav ul li a { - text-decoration: none; - color: #222330; - font-weight: 500; - font-size: 16px; -} -.tour-page .section-content .content-start h2 { - margin-top: 0; -} -.tour-page .section-content .content-leaf { - margin-top: 60px; - position: relative; -} -.tour-page .section-content .content-start { - position: relative; -} -.tour-page .anchor-link { - top: -100px; - position: absolute; - visibility: hidden; -} -.tour-page .content-main h2 > a { - color: #222330; -} -.tour-page .section-hero .button-section { - text-align: center; -} -.tour-content-header { - overflow: hidden; - padding: 1.5rem 0 0; - background: #f5f3f3; -} -.tour-content-header .block-page-title-block, -.tour-content-header .page-title, -.tour-content-header .breadcrumb__link, -.tour-content-header .breadcrumb__item + .breadcrumb__item::before { - color: #222330; - opacity: 0.9; -} - -/* Small Devices, Tablets */ -@media only screen and (max-width : 768px) { - .tour-page .section-hero .row, - .tour-page .section-content { - display: block; - } - .tour-page .section-hero { - padding: 20px; - } - .tour-page .section-content .sidenav { - width: auto; - margin-right: auto; - margin-bottom: 40px; - } - .tour-page .section-hero .text-section { - width: auto; - margin-right: auto; - } -} - -@media screen and (max-width: 1024px) and (min-width: 769px) { - .tour-page .section-content .sidenav { - width: 100%; - } -} - -.tour-checklist, -form > .fieldset { - margin-bottom: 28px; - box-shadow: none; -} -.tour-checklist .progress__track { - border: 1px #bbbec5 solid; - height: .5em; - margin-bottom: 20px; -} -.tour-checklist .progress__bar { - background: #28a9e0; - border: 1px #28a9e0 solid; - height: .5em; - min-width: 8px; -} diff --git a/modules/acquia_cms_tour/css/acquia_cms_tour_dashboard.css b/modules/acquia_cms_tour/css/acquia_cms_tour_dashboard.css index 9ddb746a2c..198e5be6b5 100644 --- a/modules/acquia_cms_tour/css/acquia_cms_tour_dashboard.css +++ b/modules/acquia_cms_tour/css/acquia_cms_tour_dashboard.css @@ -1,3 +1,4 @@ +.ui-dialog-titlebar, .tour-dashboard { text-align: center; } diff --git a/modules/acquia_cms_tour/src/Controller/WelcomeModalController.php b/modules/acquia_cms_tour/src/Controller/WelcomeModalController.php index 1e8104a9fa..4b23ce5c55 100644 --- a/modules/acquia_cms_tour/src/Controller/WelcomeModalController.php +++ b/modules/acquia_cms_tour/src/Controller/WelcomeModalController.php @@ -69,7 +69,7 @@ public function openStarterModalForm() { 'width' => 1000, ]; // Add AJAX command to open a modal dialog with the form as the content. - $response->addCommand(new OpenModalDialogCommand('', $modal_form, $modal_options)); + $response->addCommand(new OpenModalDialogCommand($this->t('Acquia CMS Starter Kit Setup Wizard'), $modal_form, $modal_options)); } return $response; @@ -88,7 +88,7 @@ public function openWelcomeModalForm() { 'width' => 500, ]; // Add an AJAX command to open a modal dialog with the form as the content. - $response->addCommand(new OpenModalDialogCommand('', $modal_form, $modal_options)); + $response->addCommand(new OpenModalDialogCommand($this->t('Welcome to Acquia CMS'), $modal_form, $modal_options)); return $response; } diff --git a/modules/acquia_cms_tour/src/Form/WelcomeModalForm.php b/modules/acquia_cms_tour/src/Form/WelcomeModalForm.php index 68e6c33d9c..405c2426cb 100644 --- a/modules/acquia_cms_tour/src/Form/WelcomeModalForm.php +++ b/modules/acquia_cms_tour/src/Form/WelcomeModalForm.php @@ -92,10 +92,6 @@ public function buildForm(array $form, FormStateInterface $form_state, $options '#type' => 'markup', '#markup' => '', ]; - $form['tour-dashboard']['title'] = [ - '#type' => 'markup', - '#markup' => '

' . $this->t('Welcome to Acquia CMS') . '

', - ]; $form['tour-dashboard']['message'] = [ '#type' => 'markup', '#markup' => '

' . $this->t("We've created an easy step by step installation wizard to guide you through the necessary configurations") . '

',