diff --git a/checklistapi.css b/checklistapi.css index 00c8327..a954ede 100644 --- a/checklistapi.css +++ b/checklistapi.css @@ -18,6 +18,11 @@ font-weight: normal; margin-bottom: 0.5em; } +#checklistapi-checklist-form .progress__bar { + animation-name: none; + background-image: none; +} #checklistapi-checklist-form .compact-link { clear: both; + padding-top: 1em; } diff --git a/checklistapi.module b/checklistapi.module index 65ef951..c192fdb 100644 --- a/checklistapi.module +++ b/checklistapi.module @@ -22,7 +22,7 @@ function checklistapi_menu_link_defaults() { 'link_title' => 'Checklists', 'description' => 'Get an overview of your installed checklists with progress details.', 'route_name' => 'checklistapi.report', - 'parent' => 'system.admin.reports', + 'parent' => 'system.admin_reports', ); return $links; @@ -81,9 +81,7 @@ function checklistapi_theme() { return array( 'checklistapi_compact_link' => array( 'template' => 'checklistapi-compact-link', - 'variables' => array( - 'link' => '', - ), + 'variables' => array('link' => ''), ), 'checklistapi_progress_bar' => array( 'path' => drupal_get_path('module', 'checklistapi') . '/templates', @@ -233,7 +231,7 @@ function checklistapi_sort_array(array $array) { $children[$key] = checklistapi_sort_array($children[$key]); } // Sort by weight. - uasort($children, 'element_sort'); + uasort($children, array('Drupal\Component\Utility\SortArray', 'sortByWeightProperty')); // Remove incremental weight hack. foreach ($children as $key => $child) { $children[$key]['#weight'] = floor($children[$key]['#weight']); diff --git a/checklistapi.routing.yml b/checklistapi.routing.yml index 46df682..ca75518 100644 --- a/checklistapi.routing.yml +++ b/checklistapi.routing.yml @@ -1,8 +1,8 @@ checklistapi.report: path: /admin/reports/checklistapi defaults: - _content: \Drupal\checklistapi\Controller\ChecklistapiController::report _title: Checklists + _content: \Drupal\checklistapi\Controller\ChecklistapiController::report requirements: _permission: view checklistapi checklists report diff --git a/lib/Drupal/checklistapi/Form/ChecklistapiChecklistForm.php b/lib/Drupal/checklistapi/Form/ChecklistapiChecklistForm.php index bad5a05..4d0c8d0 100644 --- a/lib/Drupal/checklistapi/Form/ChecklistapiChecklistForm.php +++ b/lib/Drupal/checklistapi/Form/ChecklistapiChecklistForm.php @@ -27,6 +27,7 @@ class ChecklistapiChecklistForm implements FormInterface { */ public function buildForm(array $form, array &$form_state, $checklist_id = NULL) { $form['#checklist'] = $checklist = checklistapi_checklist_load($checklist_id); + $user_has_edit_access = $checklist->userHasAccess('edit'); // Progress bar. $progress_bar = array( @@ -37,7 +38,7 @@ class ChecklistapiChecklistForm implements FormInterface { )) : ' ', '#number_complete' => $checklist->getNumberCompleted(), '#number_of_items' => $checklist->getNumberOfItems(), - '#percent_complete' => round($checklist->getPercentComplete()), + '#percent_complete' => (int) round($checklist->getPercentComplete()), ); $form['progress_bar'] = array( '#type' => 'markup', @@ -124,7 +125,7 @@ class ChecklistapiChecklistForm implements FormInterface { '#attributes' => array('class' => array('checklistapi-item')), '#default_value' => $default_value, '#description' => filter_xss_admin($description), - '#disabled' => !($user_has_edit_access = $checklist->userHasAccess('edit')), + '#disabled' => !($user_has_edit_access), '#title' => filter_xss_admin($title), '#type' => 'checkbox', '#group' => $group_key, @@ -161,7 +162,7 @@ class ChecklistapiChecklistForm implements FormInterface { '%checklist' => $checklist->title, '@num' => $num_autochecked_items, ); - $message = format_plural( + $message = \Drupal::translation()->formatPlural( $num_autochecked_items, t('%checklist found 1 unchecked item that was already completed and checked it for you. Save the form to record the change.', $args), t('%checklist found @num unchecked items that were already completed and checked them for you. Save the form to record the changes.', $args) diff --git a/lib/Drupal/checklistapi/Routing/ChecklistapiRouteSubscriber.php b/lib/Drupal/checklistapi/Routing/ChecklistapiRouteSubscriber.php index 85029f7..53b3150 100644 --- a/lib/Drupal/checklistapi/Routing/ChecklistapiRouteSubscriber.php +++ b/lib/Drupal/checklistapi/Routing/ChecklistapiRouteSubscriber.php @@ -9,6 +9,7 @@ namespace Drupal\checklistapi\Routing; use Drupal\Core\Routing\RouteSubscriberBase; use Symfony\Component\Routing\Route; +use Symfony\Component\Routing\RouteCollection; /** * Listens to the dynamic route events. @@ -57,4 +58,9 @@ class ChecklistapiRouteSubscriber extends RouteSubscriberBase { return $routes; } } + + /** + * {@inheritdoc} + */ + protected function alterRoutes(RouteCollection $collection, $provider) {} }