diff --git a/classes/Divisions.php b/classes/Divisions.php index e36b080538..90bffe5097 100644 --- a/classes/Divisions.php +++ b/classes/Divisions.php @@ -621,7 +621,6 @@ private function divisionsByPolicy($q) { if ( !array_key_exists($policy_id, $policies) ) { $policies[$policy_id] = array( 'policy_id' => $policy_id, - 'weak_count' => 0, 'divisions' => array() ); if ( $this->policies ) { @@ -633,12 +632,9 @@ private function divisionsByPolicy($q) { } } + $division = $this->getDivisionDetails($row); - if ( !$division['strong'] ) { - $policies[$policy_id]['weak_count']++; - } - $policies[$policy_id]['divisions'][] = $division; }; diff --git a/www/docs/js/main.js b/www/docs/js/main.js index 6e95930e5e..dd7dbea899 100644 --- a/www/docs/js/main.js +++ b/www/docs/js/main.js @@ -308,12 +308,6 @@ $(function(){ t.parent().next(".nav-menu").toggleClass('closed'); }); - $('.js-show-all-votes').on('click', function(){ - $(this).fadeOut(); - $('.policy-vote--minor').slideDown(); - $('#policy-votes-type').text('All'); - }); - $('a[href="#past-list-dates"]').on('click', function(e){ e.preventDefault(); $(this).trigger('blur'); diff --git a/www/docs/style/sass/pages/_mp.scss b/www/docs/style/sass/pages/_mp.scss index f0a1b66d37..2c5d03a702 100644 --- a/www/docs/style/sass/pages/_mp.scss +++ b/www/docs/style/sass/pages/_mp.scss @@ -610,26 +610,6 @@ } } -html.js { - .policy-vote--minor { - display: none; - } -} - -.policy-vote--minor { - padding-left: 1.5em; - line-height: 1.3em !important; // override .vote-descriptions .policy-votes > li - - .policy-vote__text, - .policy-vote__date { - font-size: 0.9em; - } - - .policy-vote__text { - color: #666; - } -} - .policy-vote__date { display: block; color: #b5af9d; // desaturated taupe colour @@ -709,14 +689,6 @@ html.js { margin-bottom: 0; } } - - .js-show-all-votes { - display: none; - } -} - -html.js .policy-votes-list-footer .js-show-all-votes { - display: block; } .voting-information-provenance { diff --git a/www/includes/easyparliament/templates/html/mp/_division_description.php b/www/includes/easyparliament/templates/html/mp/_division_description.php index ef7c39e005..4ce939ed41 100644 --- a/www/includes/easyparliament/templates/html/mp/_division_description.php +++ b/www/includes/easyparliament/templates/html/mp/_division_description.php @@ -1,4 +1,4 @@ -
  • +
  • On : '2020-06-01' && $division['date'] < '2020-06-10' && $division['vote'] == 'absent') { ?> diff --git a/www/includes/easyparliament/templates/html/mp/divisions.php b/www/includes/easyparliament/templates/html/mp/divisions.php index 2ebe4477a7..143baceb90 100644 --- a/www/includes/easyparliament/templates/html/mp/divisions.php +++ b/www/includes/easyparliament/templates/html/mp/divisions.php @@ -39,19 +39,31 @@ - - + - - +

    .

    @@ -69,8 +81,9 @@
    - - +

    @@ -84,9 +97,6 @@ data on PublicWhip.org.uk.

    -

    votes about :

    We don’t have enough information to calculate ’s position on this issue @@ -97,17 +107,26 @@

    + +

    Scoring votes

    + + +

    Informative votes

    + + - diff --git a/www/includes/easyparliament/templates/html/mp/recent.php b/www/includes/easyparliament/templates/html/mp/recent.php index 62354dfb6b..b86866ce52 100644 --- a/www/includes/easyparliament/templates/html/mp/recent.php +++ b/www/includes/easyparliament/templates/html/mp/recent.php @@ -26,7 +26,6 @@