Commit c9989dbe authored by catch's avatar catch
Browse files

Issue #2473877 by Lendude, quietone, pefferen: Views UI progress indicator... 

Issue #2473877 by Lendude, quietone, pefferen: Views UI progress indicator styled as pager and placed on strange location

(cherry picked from commit 46e74432)
parent 30d114cc

core/modules/views_ui/admin.inc

+2 −2
Original line number Diff line number Diff line
@@ -222,8 +222,8 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta 


  // Add the "2 of 3" progress indicator.

  if ($form_progress = $view->getFormProgress()) {

    $form['progress']['#markup'] = '<div id="views-progress-indicator" class="views-progress-indicator">' . t('@current of @total', ['@current' => $form_progress['current'], '@total' => $form_progress['total']]) . '</div>';

    $form['progress']['#weight'] = -1001;

    $arguments = $form['#title']->getArguments() + ['@current' => $form_progress['current'], '@total' => $form_progress['total']];

    $form['#title'] = t('Configure @type @current of @total: @item', $arguments);

  }



  // The dropdown should not be added when :

core/modules/views_ui/src/Form/Ajax/ConfigHandler.php

+1 −2
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $ 
      }

      else {

        $types = ViewExecutable::getHandlerTypes();

        $form['#title'] = $this->t('Configure @type: @item', ['@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()]);



        // If this item can come from the default display, show a dropdown

        // that lets the user choose which display the changes should apply to.
@@ -150,8 +151,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $ 
          ];

        }



        $form['#title'] = $this->t('Configure @type: @item', ['@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()]);



        if (!empty($handler->definition['help'])) {

          $form['options']['form_description'] = [

            '#markup' => $handler->definition['help'],